Added GtkCellArea classes to gtk.h and fixed a remainig rendering bug.

diff --git a/gtk/gtk.h b/gtk/gtk.h
index 6e99849a1c42907e4f9b69ebc2e6ea123e48c7ee..115c6c39e4bc96c8ce64279262fa303816503a2f 100644 (file)
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -52,6 +52,9 @@
 #include <gtk/gtkbuilder.h>
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkcalendar.h>
+#include <gtk/gtkcellarea.h>
+#include <gtk/gtkcellareabox.h>
+#include <gtk/gtkcellareaiter.h>
 #include <gtk/gtkcelleditable.h>
 #include <gtk/gtkcelllayout.h>
 #include <gtk/gtkcellrenderer.h>

diff --git a/gtk/gtkcellareabox.c b/gtk/gtkcellareabox.c
index a935c7bfc5659ada3bf27de75f4a1d2c64dc600f..21f84b1dab2247c8f0300eac46e9043bfb893dbe 100644 (file)
--- a/gtk/gtkcellareabox.c
+++ b/gtk/gtkcellareabox.c
@@ -586,8 +586,6 @@ get_allocated_cells (GtkCellAreaBox     *box,
       return NULL;
     }
 
-  g_print ("Allocating cells for rendering, group allocs %d\n", n_allocs);
-
   for (i = 0; i < n_allocs; i++)
     {
       /* We dont always allocate all groups, sometimes the requested group has only invisible
@@ -679,8 +677,6 @@ get_allocated_cells (GtkCellAreaBox     *box,
              
              position += sizes[j].minimum_size;
              position += priv->spacing;
-
-             j++;
            }
 
          g_free (sizes);
@@ -1059,9 +1055,6 @@ gtk_cell_area_box_render (GtkCellArea          *area,
    * of alignments and pack order etc. */
   allocated_cells = get_allocated_cells (box, box_iter, widget);
 
-  g_print ("Rendering an area with allocated cells %d\n",
-          g_slist_length (allocated_cells));
-
   for (l = allocated_cells; l; l = l->next)
     {
       AllocatedCell *cell = l->data;
@@ -1083,9 +1076,6 @@ gtk_cell_area_box_render (GtkCellArea          *area,
 
       /* XXX We have to do some per-cell considerations for the 'flags'
        * for focus handling */
-      g_print ("Rendering a cell at x: %d y: %d width %d height %d\n",
-              inner_area.x, inner_area.y, inner_area.width, inner_area.height);
-      
       gtk_cell_renderer_render (cell->renderer, cr, widget,
                                &background_area, &inner_area,
                                flags);